(shell): Look for .emacs_SHELL under ~/.emacs.d after looking in ~.

diff --git a/lisp/shell.el b/lisp/shell.el
index 94df87332659a9c56157cdc4cc658eafdb954238..0eaea9af27f62fcbd5916a4887d53da023e5c319 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -506,6 +506,8 @@ Otherwise, one argument `-i' is passed to the shell.
           (name (file-name-nondirectory prog))
           (startfile (concat "~/.emacs_" name))
           (xargs-name (intern-soft (concat "explicit-" name "-args"))))
+      (if (not (file-exists-p startfile))
+         (setq startfile (concat "~/.emacs.d/.emacs_" name)))
       (apply 'make-comint-in-buffer "shell" buffer prog
             (if (file-exists-p startfile) startfile)
             (if (and xargs-name (boundp xargs-name))